From: Timm Bäder <mail@baedert.org>
Date: Wed, 26 Apr 2017 11:43:30 +0000 (+0200)
Subject: filechooserwidget: Remove always-false error case
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~39^2~542
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=48ee8016c89f3d8816dbe859e619a112203ae940;p=gtk%2B3.0.git

filechooserwidget: Remove always-false error case

_gtk_search_engine_new never returns NULL, it always returns a valid
GObject with at least the simple search engine initialized.
---

diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index 45e4724f11..55cbb1776d 100644
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -7211,19 +7211,6 @@ search_engine_finished_cb (GtkSearchEngine *engine,
     }
 }
 
-/* Displays a generic error when we cannot create a GtkSearchEngine.
- * It would be better if _gtk_search_engine_new() gave us a GError
- * with a better message, but it doesn’t do that right now.
- */
-static void
-search_error_could_not_create_client (GtkFileChooserWidget *impl)
-{
-  error_message (impl,
-                 _("Could not start the search process"),
-                 _("The program was not able to create a connection to the indexer "
-                   "daemon. Please make sure it is running."));
-}
-
 static void
 search_engine_error_cb (GtkSearchEngine *engine,
                         const gchar     *message,
@@ -7350,14 +7337,6 @@ search_start_query (GtkFileChooserWidget *impl,
   if (priv->search_engine == NULL)
     priv->search_engine = _gtk_search_engine_new ();
 
-  if (!priv->search_engine)
-    {
-      set_busy_cursor (impl, FALSE);
-      gtk_widget_hide (priv->search_spinner);
-      search_error_could_not_create_client (impl); /* lame; we don't get an error code or anything */
-      return;
-    }
-
   if (!priv->search_query)
     {
       priv->search_query = gtk_query_new ();